From b41da9dbb907005b3b11af9df1e1dc0f7329e394 Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Sat, 18 Nov 2023 19:07:36 -0700 Subject: [PATCH] retire LegacyFormat class. (#1233) --- CMakeLists.txt | 1 - defs.h | 40 --------------------- legacyformat.h => deprecated/legacyformat.h | 0 vecs.cc | 1 - 4 files changed, 42 deletions(-) rename legacyformat.h => deprecated/legacyformat.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d96f2d5c7..b02d70d55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,7 +227,6 @@ set(HEADERS html.h inifile.h kml.h - legacyformat.h igc.h lowranceusr.h mkshort.h diff --git a/defs.h b/defs.h index 99e3a54bc..1e4523f43 100644 --- a/defs.h +++ b/defs.h @@ -807,14 +807,6 @@ struct posn_status { extern posn_status tracking_status; -using ff_init = void (*)(const QString&); -using ff_deinit = void (*)(); -using ff_read = void (*)(); -using ff_write = void (*)(); -using ff_exit = void (*)(); -using ff_writeposn = void (*)(Waypoint*); -using ff_readposn = Waypoint* (*)(posn_status*); - #define ARGTYPE_UNKNOWN 0x00000000U #define ARGTYPE_INT 0x00000001U #define ARGTYPE_FLOAT 0x00000002U @@ -886,38 +878,6 @@ enum ff_cap { #define FF_CAP_RW_WPT \ { (ff_cap) (ff_cap_read | ff_cap_write), ff_cap_none, ff_cap_none} -/* - * Format capabilities for realtime positioning. - */ -struct position_ops_t { - ff_init rd_init; - ff_readposn rd_position; - ff_deinit rd_deinit; - - ff_init wr_init; - ff_writeposn wr_position; - ff_deinit wr_deinit; -}; - -#define NULL_POS_OPS { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, } - -/* - * Describe the file format to the caller. - */ -struct ff_vecs_t { - ff_type type; - QVector cap; - ff_init rd_init; - ff_init wr_init; - ff_deinit rd_deinit; - ff_deinit wr_deinit; - ff_read read; - ff_write write; - ff_exit exit; - QVector* args; - position_ops_t position_ops; -}; - [[noreturn]] void fatal(QDebug& msginstance); // cppcheck 2.10.3 fails to assign noreturn attribute to fatal if // the noreturn attribute is listed before the gnu::format attribute. diff --git a/legacyformat.h b/deprecated/legacyformat.h similarity index 100% rename from legacyformat.h rename to deprecated/legacyformat.h diff --git a/vecs.cc b/vecs.cc index 4d8826d03..42c1f4291 100644 --- a/vecs.cc +++ b/vecs.cc @@ -61,7 +61,6 @@ #include "igc.h" // for IgcFormat #include "inifile.h" // for inifile_readstr #include "kml.h" // for KmlFormat -#include "legacyformat.h" // for LegacyFormat #include "lowranceusr.h" // for LowranceusrFormat #include "mtk_logger.h" // for MtkFormat, MtkM241Format, MtkFileFormat, MtkM241FileFormat #include "nmea.h" // for NmeaFormat -- 2.30.2